Use gsize instead of unsigned and gulong instead of long, fixes complation

    * gtk/gtkbuilder.c (gtk_builder_add_from_file):
    (gtk_builder_value_from_string_type):
    Use gsize instead of unsigned and gulong instead of long,
    fixes complation on OSX, fixes #447987

svn path=/trunk/; revision=18146

diff --git a/ChangeLog b/ChangeLog
index 4dba5a61bc171888da2402cc1d36233af3830aff..6b5519ced186226fe9e88bcf1d6acc2835ebbfe0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-15  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtkbuilder.c (gtk_builder_add_from_file): 
+       (gtk_builder_value_from_string_type): 
+       Use gsize instead of unsigned and gulong instead of long,
+       fixes complation on OSX, fixes #447987
+
 2007-06-15  Matthias Clasen  <mclasen@redhat.com>
        
        * gtk/gtkmenushell.[ch]: add move_selected signal to allow 

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index a4017c3ce4e9c0bf01a60fc90af8a26852420803..63b2f09a2838a873f0800917c94b61e90ad7d669 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -600,7 +600,7 @@ gtk_builder_add_from_file (GtkBuilder   *builder,
                            GError      **error)
 {
   char *buffer;
-  unsigned length;
+  gsize length;
   GError *tmp_error;
 
   g_return_val_if_fail (GTK_IS_BUILDER (builder), 0);
@@ -1020,7 +1020,7 @@ gtk_builder_value_from_string_type (GType        type,
     case G_TYPE_UINT:
     case G_TYPE_ULONG:
       {
-        ulong ul;
+        gulong ul;
         errno = 0;
         ul = strtoul (string, NULL, 0);
         if (errno)